bitkeeper revision 1.1160 (41137784IZQiNzib_RfxG3ZoH3cPag)

Merge latest version of Xen and xenolinux.

diff --cc .rootkeys
Simple merge

diff --cc xen/Rules.mk
Simple merge

diff --cc xen/common/domain.c
Simple merge

diff --cc xen/common/kernel.c
index 6a39946d700d276f7a6a574c942bd483f0a23b6e,e32a43a6278261be9053569d919799e92aac842c..23b7a1c4ebb226094af19ec25ff9f53eccf96815
--- 1/xen/common/kernel.c
--- 2/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@@ -101,30 -87,27 +103,31 @@@ static struct 
      unsigned char *name;
      enum { OPT_STR, OPT_UINT, OPT_BOOL } type;
      void *var;
 +    unsigned int len;
  } opts[] = {
 -    { "console",           OPT_STR,  &opt_console },
 -    { "conswitch",         OPT_STR,  &opt_conswitch },
 -    { "com1",              OPT_STR,  &opt_com1 },
 -    { "com2",              OPT_STR,  &opt_com2 },
 -    { "dom0_mem",          OPT_UINT, &opt_dom0_mem }, 
 -    { "noht",              OPT_BOOL, &opt_noht },
 -    { "noacpi",            OPT_BOOL, &opt_noacpi },
 -    { "nosmp",             OPT_BOOL, &opt_nosmp },
 -    { "noreboot",          OPT_BOOL, &opt_noreboot },
 -    { "ignorebiostables",  OPT_BOOL, &opt_ignorebiostables },
 -    { "watchdog",          OPT_BOOL, &opt_watchdog },
 -    { "pdb",               OPT_STR,  &opt_pdb },
 -    { "xendbg",            OPT_STR,  &opt_xendbg },
 -    { "tbuf_size",         OPT_UINT, &opt_tbuf_size },
 -    { "sched",             OPT_STR,  &opt_sched },
 -    { "physdev_dom0_hide", OPT_STR,  &opt_physdev_dom0_hide },
 -    { "leveltrigger",      OPT_STR,  &opt_leveltrigger },
 -    { "edgetrigger",       OPT_STR,  &opt_edgetrigger },
 -    { "xenheap_megabytes", OPT_UINT, &opt_xenheap_megabytes },
 -    { NULL,               0,        NULL     }
 +#define V(_x) &_x, sizeof(_x)
 +    { "console",           OPT_STR,  V(opt_console) },
 +    { "conswitch",         OPT_STR,  V(opt_conswitch) },
 +    { "com1",              OPT_STR,  V(opt_com1) },
 +    { "com2",              OPT_STR,  V(opt_com2) },
 +    { "dom0_mem",          OPT_UINT, V(opt_dom0_mem) },
 +    { "noht",              OPT_BOOL, V(opt_noht) },
 +    { "noacpi",            OPT_BOOL, V(opt_noacpi) },
 +    { "nosmp",             OPT_BOOL, V(opt_nosmp) },
 +    { "noreboot",          OPT_BOOL, V(opt_noreboot) },
 +    { "ignorebiostables",  OPT_BOOL, V(opt_ignorebiostables) },
 +    { "watchdog",          OPT_BOOL, V(opt_watchdog) },
 +    { "pdb",               OPT_STR,  V(opt_pdb) },
 +    { "tbuf_size",         OPT_UINT, V(opt_tbuf_size) },
 +    { "sched",             OPT_STR,  V(opt_sched) },
 +    { "physdev_dom0_hide", OPT_STR,  V(opt_physdev_dom0_hide) },
 +    { "leveltrigger",      OPT_STR,  V(opt_leveltrigger) },
 +    { "edgetrigger",       OPT_STR,  V(opt_edgetrigger) },
 +    { "xenheap_megabytes", OPT_UINT, V(opt_xenheap_megabytes) },
 +    { "nmi",               OPT_STR,  V(opt_nmi) },
 +    { "badpage",           OPT_STR,  V(opt_badpage) },
++    { "xendbg",            OPT_STR,  V(opt_xendbg) },
 +    { NULL,                0,        NULL, 0 }
  };
  
  

diff --cc xen/drivers/char/console.c
Simple merge

diff --cc xen/drivers/char/serial.c
Simple merge